# This is a BitKeeper generated patch for the following project: # Project Name: Linux kernel tree # This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas: # ChangeSet 1.1046.15.30 -> 1.1046.15.31 # include/linux/timex.h 1.7 -> 1.8 # # The following is the BitKeeper ChangeSet Log # -------------------------------------------- # 03/05/20 davej@codemonkey.org.uk 1.1046.80.11 # [AGPGART] Skip nonisoch setup if isoch setup was successful. # -------------------------------------------- # 03/05/20 davej@codemonkey.org.uk 1.1046.80.12 # [AGPGART] Silly typo that put tried to put things into a impossible x16 mode. # -------------------------------------------- # 03/05/20 davej@tetrachloride.(none) 1.1046.98.15 # Merge tetrachloride.(none):/mnt/raid/src/kernel/2.5/bk-linus # into tetrachloride.(none):/mnt/raid/src/kernel/2.5/agpgart # -------------------------------------------- # 03/05/19 davem@nuts.ninka.net 1.1046.1.121 # [NET]: Fix netdevice unregister races. # # We had two major issues when unregistering networking devices. # 1) Even trying to run hotplug asynchronously could deadlock # if keventd was currently trying to get the RTNL semaphore # in order to process linkwatch events. # 2) Unregister needs to wait for the last reference to go away # before the finalization of the unregister can execute. This # cannot occur under the RTNL semaphore as this is deadlock # prone as well. # # The solution is to do all of this stuff after dropping the # RTNL semaphore. rtnl_lock, if it is about to protect a region # of code that could unregister network devices, registers a list # to which unregistered netdevs are attached. At rtnl_unlock time # this list is processed to wait for refcounts to drop to zero and # then finalize the unregister. # -------------------------------------------- # 03/05/19 andmike@us.ibm.com 1.1046.105.1 # [PATCH] Call release on scsi legacy LLDD # # In the sysfs scsi host reference counting merge the call to a legacy hosts # release function was removed. # # This patch adds the call back in. # # This patch was tested with insmod / rmmod on LLDDs using the legacy interface # and LLDDs using the new interface: # # Legacy Interface: # qla2xxx-v8.00.00b1 # qlogicisp # aic7xxx_old (Does not call scsi_unregister in release, but unloaded) # # New Interface: # scsi_debug # aic7xxx (Many illegal context warnings caused by mid vs LLDD primitive # mixing, but appears to unload clean). # # drivers/scsi/hosts.c | 4 ++++ # 1 files changed, 4 insertions(+) # -------------------------------------------- # 03/05/19 oliver@neukum.org 1.1046.105.2 # [PATCH] fix irq handling for DC395 # # this fix makes sure that all test in irq handling in that # driver are for NULL thus fixing an oops. # -------------------------------------------- # 03/05/19 dougg@torque.net 1.1046.105.3 # [PATCH] scsi_mid_low_api.txt in lk 2.5.69 # # This is a catch up, applying the patch that Andries # Brouwer sent a while back. It will apply to lk 2.5.69 # and 2.5.69-bk10 . # -------------------------------------------- # 03/05/19 hch@lst.de 1.1046.106.1 # [PATCH] give ->proc_info a struct Scsi_Host * parameter # # Yeah, I know the method is obsolete but for proper refcounting we # need to get rid of all those scsi_host_hn_get() abusers. # # scsi_host_hn_get() and scsi_host_put() are not exported anymore # after this patch. # -------------------------------------------- # 03/05/19 jejb@raven.il.steeleye.com 1.1046.105.4 # Merge raven.il.steeleye.com:/home/jejb/BK/scsi-tmp-2.5 # into raven.il.steeleye.com:/home/jejb/BK/scsi-misc-2.5 # -------------------------------------------- # 03/05/19 torvalds@home.transmeta.com 1.1046.98.16 # Merge bk://kernel.bkbits.net/davem/sparc-2.5 # into home.transmeta.com:/home/torvalds/v2.5/linux # -------------------------------------------- # 03/05/20 acme@conectiva.com.br 1.1046.98.17 # o sock.h: kernel-doc style comment for struct sock # -------------------------------------------- # 03/05/19 davem@nuts.ninka.net 1.1046.1.122 # [NET]: More device register/unregister fixing. # # Revert the rtnl_lock API change, it is totally unneeded. # Instead we manage the todo work inside of net/core/dev.c # # Also, we have to move sbin hotplug invocation outside of # the RTNL semaphore as well, both for register and unregister. # -------------------------------------------- # 03/05/19 davem@nuts.ninka.net 1.1046.1.123 # [NET]: Fix sock_fprog setsockopt compat handling. Based upon patch from Andi Kleen. # -------------------------------------------- # 03/05/19 davidm@tiger.hpl.hp.com 1.1046.15.31 # Fix locking comments for time interpolator routines. # -------------------------------------------- # diff -Nru a/include/linux/timex.h b/include/linux/timex.h --- a/include/linux/timex.h Mon Sep 22 12:59:54 2003 +++ b/include/linux/timex.h Mon Sep 22 12:59:54 2003 @@ -336,7 +336,7 @@ extern void register_time_interpolator (struct time_interpolator *); extern void unregister_time_interpolator (struct time_interpolator *); -/* Called with xtime read- OR write-lock acquired. */ +/* Called with xtime WRITE-lock acquired. */ static inline void time_interpolator_update (long delta_nsec) { @@ -371,7 +371,7 @@ (*ti->update)(delta_nsec); } -/* Called with xtime read- or write-lock acquired. */ +/* Called with xtime WRITE-lock acquired. */ static inline void time_interpolator_reset (void) { @@ -382,6 +382,7 @@ (*ti->reset)(); } +/* Called with xtime READ-lock acquired. */ static inline unsigned long time_interpolator_get_offset (void) {